From f7737a0bfd55ddfbf4049465374ce245f242598a Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 22 Jun 2004 16:49:40 +0000 Subject: [PATCH] bitkeeper revision 1.994.1.7 (40d86324dX6OPOXf6BKpjF4lrFQE0g) ui tweak --- tools/examples/xc_dom_control.py | 10 +++++----- tools/xenmgr/lib/XendDomainInfo.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/examples/xc_dom_control.py b/tools/examples/xc_dom_control.py index 583d629c74..998c856881 100755 --- a/tools/examples/xc_dom_control.py +++ b/tools/examples/xc_dom_control.py @@ -88,11 +88,11 @@ elif cmd == 'list': print 'Dom Name Mem(kb) CPU State Time(ms)' for domain in xc.domain_getinfo(): - run = (domain['running'] and 'r') or '-' - block = (domain['blocked'] and 'b') or '-' - stop = (domain['paused'] and 'p') or '-' - susp = (domain['shutdown'] and 's') or '-' - crash = (domain['crashed'] and 'c') or '-' + run = (domain['running'] and 'R') or 'r' + block = (domain['blocked'] and 'B') or 'b' + stop = (domain['paused'] and 'P') or 'p' + susp = (domain['shutdown'] and 'S') or 's' + crash = (domain['crashed'] and 'C') or 'c' domain['state'] = run + block + stop + susp + crash domain['cpu_time'] = domain['cpu_time']/1e6 diff --git a/tools/xenmgr/lib/XendDomainInfo.py b/tools/xenmgr/lib/XendDomainInfo.py index c41ac73b50..c4c93c8d57 100644 --- a/tools/xenmgr/lib/XendDomainInfo.py +++ b/tools/xenmgr/lib/XendDomainInfo.py @@ -111,11 +111,11 @@ class XendDomainInfo: ['name', self.name], ['memory', self.memory] ] if self.info: - run = (self.info['running'] and 'r') or '-' - block = (self.info['blocked'] and 'b') or '-' - stop = (self.info['paused'] and 'p') or '-' - susp = (self.info['shutdown'] and 's') or '-' - crash = (self.info['crashed'] and 'c') or '-' + run = (self.info['running'] and 'R') or 'r' + block = (self.info['blocked'] and 'B') or 'b' + stop = (self.info['paused'] and 'P') or 'p' + susp = (self.info['shutdown'] and 'S') or 's' + crash = (self.info['crashed'] and 'C') or 'c' state = run + block + stop + susp + crash sxpr.append(['cpu', self.info['cpu']]) sxpr.append(['state', state]) -- 2.30.2